Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:53:34 +0000 (22:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:53:34 +0000 (22:53 -0700)
commitb4a8f65eded8beedcfe7eba877ba12ad46775c31
tree15ea30f13fc232c7d9b2071a380fe70495614a7e
parent9489390f05c26adecfeca89874d34ee0591a1dc9
parent7f6058d7dcd8d198f68a6a81c5ed2908af4b8cfd
Merge from trunk.